Don't display too many broken images. (#169870, Roman Kagan, patch by Ivan

2005-04-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose):
	Don't display too many broken images.  (#169870, Roman
	Kagan, patch by Ivan Wong)

	* gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
	output.  (#300013, Tommi Komulainen)

	* io-bmp.c (gdk_pixbuf__bmp_image_save_to_callback):
	Don't overflow the stack.  (Jakub Jelinek, Arjan van de Ven)

diff --git a/ChangeLog b/ChangeLog
index 922ad4450138048160e13d5c1e41ab662e69c048..0964388419ade43a8afe1a9e8ebe7cab00df78c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+       Don't display too many broken images.  (#169870, Roman
+       Kagan, patch by Ivan Wong)
+
+       * gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+       output.  (#300013, Tommi Komulainen)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 922ad4450138048160e13d5c1e41ab662e69c048..0964388419ade43a8afe1a9e8ebe7cab00df78c2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+       Don't display too many broken images.  (#169870, Roman
+       Kagan, patch by Ivan Wong)
+
+       * gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+       output.  (#300013, Tommi Komulainen)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 922ad4450138048160e13d5c1e41ab662e69c048..0964388419ade43a8afe1a9e8ebe7cab00df78c2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
+       Don't display too many broken images.  (#169870, Roman
+       Kagan, patch by Ivan Wong)
+
+       * gtk/gtkwidget.c (gtk_widget_unparent): Remove debugging
+       output.  (#300013, Tommi Komulainen)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkimage.c (gtk_image_expose, gtk_image_calc_size): 

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f66a63cc312983720c80d772481a3d2903d4639d..effe56f2138f90b9547b48e5acca8d89f04d9bd2 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * io-bmp.c (gdk_pixbuf__bmp_image_save_to_callback): 
+       Don't overflow the stack.  (Jakub Jelinek, Arjan van de Ven)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        * io-pcx.c: No debugging output, please. (#173107,

diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index c754431fcf8c56afe4602ca17b13c1e929f0c0d3..ffde9ab12321fc694acf2cb568523fc35c12f410 100644 (file)
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -1155,7 +1155,7 @@ gdk_pixbuf__bmp_image_save_to_callback (GdkPixbufSaveFunc   save_func,
                                        GError            **error)
 {
        guint width, height, channel, size, stride, src_stride, x, y;
-       guchar BFH_BIH[40], *pixels, *buf, *src, *dst, *dst_line;
+       guchar BFH_BIH[54], *pixels, *buf, *src, *dst, *dst_line;
        gboolean ret;
 
        width = gdk_pixbuf_get_width (pixbuf);

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index b512292779a941a5175f3a20a3f2a15e40e880fe..e982cd08bda9745e1261ba4f2fe564798e1d5941 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1547,7 +1547,6 @@ gtk_image_expose (GtkWidget      *widget,
       GdkBitmap *mask;
       GdkPixbuf *pixbuf;
       gboolean needs_state_transform;
-      GtkStockItem item;
       gchar *stock_id;
          
       
@@ -1657,7 +1656,7 @@ gtk_image_expose (GtkWidget      *widget,
           break;
 
         case GTK_IMAGE_STOCK:
-         if (gtk_stock_lookup (image->data.stock.stock_id, &item))
+         if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id))
            stock_id = image->data.stock.stock_id;
          else
            stock_id = GTK_STOCK_MISSING_IMAGE;
@@ -1957,7 +1956,6 @@ gtk_image_calc_size (GtkImage *image)
 {
   GtkWidget *widget = GTK_WIDGET (image);
   GdkPixbuf *pixbuf = NULL;
-  GtkStockItem item;
   gchar *stock_id;
   
   /* We update stock/icon set on every size request, because
@@ -1968,7 +1966,7 @@ gtk_image_calc_size (GtkImage *image)
   switch (image->storage_type)
     {
     case GTK_IMAGE_STOCK:
-      if (gtk_stock_lookup (image->data.stock.stock_id, &item))
+      if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id))
        stock_id = image->data.stock.stock_id;
       else
        stock_id = GTK_STOCK_MISSING_IMAGE;

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 4bc6e3e9c2bbe3683193376dd177b50e2d623225..44ecea206b80265156f7587fb4f6fdf5bd3e2ac3 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1901,12 +1901,7 @@ gtk_widget_unparent (GtkWidget *widget)
   if (GTK_WIDGET_REALIZED (widget)) 
     {
       if (GTK_WIDGET_IN_REPARENT (widget))
-#if 1
-       {
-         g_print ("unmapping!\n");
-         gtk_widget_unmap (widget);
-       }
-#endif
+       gtk_widget_unmap (widget);
       else
        gtk_widget_unrealize (widget);
     }